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.
* Fabfile has not been tested with a deploy yet, but looks sane, and merging to ensure less divergence.