Update gems to latest.
Merge branch 'master' into engineyard

Conflicts:
	Gemfile.lock
bundle update