Merge pull request #85 from cameronjacoby/master

refactor model tests to use factory girl & ffaker