Rails 4 upgrade changes
Route tweaks for rails 4
Merge branch 'rails4'