Merge pull request #1 from amorphid/mod1

Rewrite model tests using shoulda matchers
Merge pull request #2 from amorphid/mod2

Mod2