messing with the readme
Updating readme.
Fixed conflict between adam and chris.
Finishing touches.  Making her nice.
Merge branch 'release/v1.0' into develop