fixes
Merge branch 'master' of https://github.com/tiagomacarios/pybtsync

Conflicts:
	pybtsync/pybtsync.py