Passing tests and spacing cleanup
spacing and method cleanup
rails 4 upgrade
Merge pull request #1 from JPrevost/rails4

Rails4