Use `bundle exec spec` to run tests.
Rename identical column names
Merge pull request #32 from maxd/master

Rename identical column names
Merge remote-tracking branch 'upstream/master'