Update for Rails 4 syntax
Fix typo's in files