2-1-stable

Made routes work with rails 4.
Made tests work.
Updated the Gemfile.