1.0.0 dev

pulling in some final changes before doing a tag for pre-release code