Initial database config settings
Merge branch 'master' into ryano
Merge pull request #2 from BensAwesomeOrg/ryano

Initial database config settings