Updated to Vagrant 1.2 and improved docs
Configuration improvements of the variety that make shit work
Merged stuff.