Merge branch 'develop' into postgres
suddenly needed host localhost in database yml - worked without it before on OSX ...
merging in postgres OSX fix
resolve merge in database.yml