updates and cleanup
Merge branch 'master' of github.com:dizz/icclab-puppet-savanna