If btsync.conf includes login and password, use them.
Merge branch 'flexionmaster'
Merge branch 'master' of https://github.com/marxjohnson/btsyncindicator

Conflicts:
	btsyncindicator.py