Added puppetfile
Removed modules
Updated gitignore
Renamed dupe
Updated readmen
Added compass-normalize, compass-rgbapng, toolkit and susy gems so that Omega 4.x works out of the box.
Merge pull request #24 from JustAnotherMark/master

Added compass-normalize, compass-rgbapng, toolkit and susy gems
Updated readme
Merge pull request #25 from waako/readme_updates

Readme updates
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
Added mailcatcher to build
Updated readme
Reworked the flow of the readme
Revert "Removed modules"

This reverts commit 29791a88a036fbab06a8afa07c1b0f50aa36ed6a.
Revert "Removed service call in php5-fpm and changed mysql root password define"

This reverts commit bb221662bba66f887c51b89d5f940a5f23d81ffc.
update readme to remove librarian puppet
Remove mailcatcher service call in puppet run with mailcatcher --ip=0.0.0.0