Merge branch 'master' into rebranded

This is in order to use --strategy=ours to basically force rebranded
this to be the new master

Merge pull request SpiderOak#175 from devgeeks/issue-137-174-char-enc…

…oding

Avoid char encoding issues and XAS

Version bump to 1.1.0

Bump version to 1.0.1

Version bump to 1.0.0

However, due to weirdness in the windows installer, I might have to bump this to 1.0.1 for launch...

Version bump to RC.1

bump to 1.0.0-beta.6

Merge pull request SpiderOak#84 from devgeeks/visual_polish

Visual polish

Version bump

Merge pull request SpiderOak#71 from devgeeks/private-beta-launch

Private beta launch