Refactored server-side config loading + code cleanup
Merge pull request #279 from qiangdavidliu/2.x

Refactored server-side config loading + code cleanup