undoing the madness
Adding VagrantFile
Adding .gitignore
Add box for Vagrant and settings for minion and master file
Changing RAM in Vagrant file
Updated vagrantfile to bring up two boxes, need to figure out why they both download
Changed memory and fixed minion config
Just need to figure out keys
Updating from laptop
Fail
Working master / minion
Merge branch 'master' into matt