Merge pull request #35 from jhesketh/master

Fix puppet
Update zuul footer message (to what is deployed)
Bring turbo-hipster setup uptodate with what is deployed