Merging everything from 1.0.2-dev into the master branch

We are quickly closing upon a production ready release.  Everything is going to be tested 1 last time, and if it passes this will be tagged as a release