Cleanup.
Merge branch 'master' of github.com:jpmontez/remote

Conflicts:
	remote/remote.py