minor chnages
Merge branch 'master' of https://github.com/kissync/kissync-python

Conflicts:
	requests/status_codes.pyc