Merging v0.2

A bunch of changes and updates have made this v0.2 ready. Things seem pretty stable right now and we're handling a lot of different scenarios to make for a pleasant `vagrant up` in any scenario.

I'm going to take a guess at handling future development on this, we'll revisit as we go:
* Stable master, current release
* Tags for each release
* Unstable development branch for day to day
* Shoot for weekly updates to master