Merge pull request #152 from acmetech/master

Start organizing the spec layout and leveraging shoulda-matchers
Merge pull request #154 from acmetech/master

Code style