Changing from cloudapp to clapp
Merge branch 'devel' of github.com:ryanolson/clapp into devel