upgrade app to rails 4
missed some changes
Merge pull request #194 from joh641/rails4

upgrade app to rails 4