Bootstrap stable test state

These changes appear to be stable and have been tested on a Rackspace server, Digital Ocean, Vagrant on @jeremyBass's windows and @clintyoung's mac.  As of yet everything seems good to go