Upgrade to Rails 3.1.10
And the Gemfile.lock :)
Merge branch 'master' of github.com:anolson/log_pile

Conflicts:
	Gemfile.lock