Upgrade to Rails 4.0.3 (security fixes)
Limit the size of logfiles to 20MB in dev, test
Merge commit 'fe7ca17' into rails-3-2
Merge branch 'master' into rails-3-2

Conflicts:
	config/environments/development.rb