Moved rails app to subdirectory to allow use of vagrant
Added initial vagrant/puppet box config
Merge branch 'master' of /Users/chris.fell/Dropbox/Projects/LaurensWebsite
Fixed merge issue
Puppet apache now working with standard arch config
modularising puppet config
Basic ruby install working with puppet
Nginx installing
Starting nginx service automatically
Added nginx config file
nginx connected to rails instance
Using default 1.9.3 package instead of customising
Getting reading to switch (temporarily) back to sqlite
base nginx now installing via packages instead of source
cleanup of puppet config
Basing off custom ubuntu box instead of default
Up to bundle install
Starting on initscript for rails app
Adding postgres config
Added postgresql modules