Merge: Use /current and add deps

This merges Marc's changes.
* Surf always uses "current", so to keep development as close to production as possible, we'll use the "current" folder instead of "vagrant".
* Start moving dependencies away from beanstalk