Added config file to be used for database name and password vairables and potentially others.
Merge remote-tracking branch 'origin/master'