Updating puppet modules
Merge branch 'update_1.1.4'

Conflicts:
	puppet/Puppetfile
	puppet/Puppetfile.lock
Merge branch 'capistrano_updates'
Merge branch 'update_puppet'
Merge branch 'librarian_shell'
Merge branch '1.1.x'
Updating to 1.1.10 of puppet-forumone
Removing platform from vhost