Merge pull request #81 from jasnow/master

Upgraded simplecov and database_cleaner gems then refreshed Gemfile.lock file