Update links
Update README.md
Remove the Ruby version from the gemfile
Update rails to 4.0.4 and fix a dependency issue with sass-rails
Update Rails to 4.1
Update config files with "rake rails:update"
Set up the Spring preloader
Update dependencies with "bundle update"
Use Bootstrap from a CDN
Update dependencies with "bundle update"
Update Bootstrap
Merge branch 'master' into ice-cube

Conflicts:
	Gemfile.lock