Changed deprecation notices to notes.
Run specs with bundler.
Port back more functionality from the 1.1 branch and describe changes to come.