Neaten up env file injections, remove empty lines from injections and add database.example.yml
Fix merge conflicts