1.0.0 dev

pulling in everything from the 1.0.0-dev branch