add proxyPass directives, update aliases
fix merge conflict
Merge pull request #29 from jlambert121/proxypass_aliases

add proxyPass directives, update aliases