added Vagrantfile and provisioning file
merged Vagrant environment set-up with master; resolved conflicts in gitignore
Merge pull request #10 from chrso/master

Vagrant