fixes
skip mark-long-lines in web-mode
Use http_proxy environment variable, if set
Merge pull request #45 from r-darwish/elpa-proxy

Use http_proxy environment variable, if set
Merge remote-tracking branch 'refs/remotes/upstream/master' into packages