Vik/vagrant merge branch

* Merge in nate's branch that makes changes to fabric and vagrant.
* Fix some fabfile issues and generally clean up/comment fabfile.