Merge branch 'nightly' into dev

* nightly:
  made the vagrant installation
Merge branch 'dev' into nightly

* dev:
Merge branch 'dev' of https://github.com/wookiecooking/tonic into dev

* 'dev' of https://github.com/wookiecooking/tonic:
clean up
Merge branch 'dev' of https://github.com/wookiecooking/tonic into dev

# Via Austin Turnage
* 'dev' of https://github.com/wookiecooking/tonic: