Just reset db/schema.rb
Merge branch 'master' of https://github.com/josh/dotfiles