Merge branch 'capistrano_updates' into 1.1.x
Updating to puppet-forumone 1.1.8
Adding restart after deployment
Merge branch 'update_puppet'