edx/edx-platform — pull request #453 by singingwolfboy (2013-07-21 23:18:28+00:00)
Title: Fixes for `vagrant up`

Rebased off #398. @yarko, since there were conflicts, can you please review and make sure this looks good?