bump rails 3
rails 4.0
simplify
proper file deletion
bump and wwtd
Merge pull request #9 from zendesk/grosser/rails4

rails4