Merge pull request #1 from RexOps/master

sync with master
Implement feature to tie server.ini to specified -E environment (server.$environment.ini).
Merge pull request #413 from ehuelsmann/feature/server-environment-ini

Feature/server environment ini