Improved syncing.
Merge branch 'master' of https://github.com/kanassar/hose

Conflicts:
	server.go