fixed merge conflict
updates to forecaster
Merge branch 'master' of github.com:weareytm/Ragnarok
Fixing DB settings
undoing a couple of changed files that weren't ready to be committed
Merge branch 'master' into postgres