rails4 compatibility
fix deprecation warnings
Merge branch 'master' into rails4
remove deprecated config options
gem updates
switch to .ruby-version instead of .rvmrc
gem updates
gem updates
Rails4 baby!

Conflicts:
	Gemfile.lock