Added puppetfile
Removed modules
Updated gitignore
Renamed dupe
Updated readmen
Specify versions of modules to use where possible to limit breaking backwards compatability
Removed service call in php5-fpm and changed mysql root password define
Merge branch 'master' into librarian

Conflicts:
	README.md
Added manual update to puppet to fix ruby issues
Merge branch 'master' into do
removed the unneeded inline shell line