Fixed motd, sort of
Added a lot of changes from the past few months
Merge branch 'master' of https://github.com/crew/puppetmaster