Added `proxyConfig` and `proxyPort` config settings that will override the output from `getHost()` and `getBaseurl()`
Merge branch 'master' of https://github.com/balderdashy/sails