Set a more liberal Bundler and Rails dependency and update authors.
Update Gemfile to use rubygems for friendly_id
Merge remote-tracking branch 'darrennix/rails-4-1' into rails-4-1

Conflicts:
	Gemfile