Clean up, clean up!
Updated Vagrantfile
Merge pull request #193 from joshbeitler/develop

Develop