server config changes
Merge pull request #146 from bepetersn/master

server config changes