Added default username and password to database config file.
Merge branch 'master' of github.com:robertpyke/thesis