Modified Vagrantfile and yml files for vagrant 1.5+, tweaked .gitignore