VERSION 2.0!!!!! Refactored . . . pretty much everything to make deployments more magical
Merging dev into master