Removed an unneeded package from package.json, edited project description
Added an option for upstreamProxy
Merge branch 'proxy'
Merge branch 'master' into gh-pages
Added note in the docs about upstreamProxy