Merge branch 'master' of https://github.com/brettgpalmer/cloudops

Conflicts:
	build.gradle
Sync changes from laptop

Just syncing changes from laptop.