small changes
Merge branch 'master' of https://github.com/kissync/kissync-python

Conflicts:
	smartfile/__init__.pyc
	test-again.py