No trailing whitespace in fabfile.
Merge branch 'master' into init-map