Missing columns unspotted during merging
Merge branch 'master' of github.com:garethr/vagrantboxes-heroku