Cleaning up cloud code
Merge branch 'master' of https://github.com/scobb/Impromptu