Update Gemfile
Merge pull request #1 from mattleonard/matt-branch

Changed gem file
OMG fixed those merge conflicts
Merge pull request #2 from mattleonard/logan-branch

Update Gemfile
Added cucumber and postgres