Initial commit. Working on getting a good vagrantfile for go/revel.
Merge remote-tracking branch 'origin/master'