Neaten up env file injections, remove empty lines from injections and ad...

...d database.example.yml