Updated settings to use Appconf::merge()
Merge pull request #1 from jbroadway/master

Updated settings to use Appconf::merge()