Fixed styles and rspec deprecations
Merge pull request #83 from projecthydra/style_fixes

Fixed styles and rspec deprecations