Merge pull request #143 from thecookiefactory/master

Merge
Catch database connection errors
Update gitignore
Merge pull request #144 from thecookiefactory/dev

Gitignore update