Not sure why I never cleaned these up
Rails4 update
lambda, lambda, lambda
Merge branch 'master' into rails4

Conflicts:
	Gemfile.lock