Updates Gemfile.lock.
Opts to mount the engine by hand instead of auto-mounting after main application's routes.

Catch all route was causing infinite redirect loop.
copy changes
version bump to 1.2.0
Merge branch 'master' into development

Conflicts:
	Gemfile.lock
	README.md
Merge pull request #7 from gblakeman/development

1.2.0 version release