Fix environment file to default to 'development' env, add db to .gitignore
Merge conflict fix