Cleaned up Vagrantfile, began work on puppet