1.0.0 dev

getting 1.0.0 and master in sync... we aren't quite at a 1.0.0 release, but we are getting close