fix rails 4 deprecation warnings
Merge pull request #1 from chingor13/rails4

fix rails 4 deprecation warnings