Tidied configuration and added database configuration.
Merge branch 'master' of github.com:invertedtomato/ChERP