updates for Rails 4
bumped version
build on modern ruby
Merge remote-tracking branch 'upstream/master' into upstream

Conflicts:
	app/models/shortener/shortened_url.rb
	spec/dummy/config/routes.rb