Cleaned up baseurl config
Added type config for databases
Merge branch 'master' into development