Update README and version
Updates for 1.0.0 compat
Prepping for 1.0.1 release
Need Gemfile.lock for 1.0.1 release
Resolve merge conflicts