Merge remote-tracking branch 'refs/remotes/TheKiteEathingTree/zpm' into zpm
Fix install
Merge branch 'master' into zpm

Conflicts:
	app/config/api/zed/config_fs.js
	app/config/api/zed/http.js
	app/config/api/zed/project.js
	app/js/sandbox.js
Bunch of work to get ZPM new-style to work, getting there.
Remove log
Merge branch 'master' into zpm
Automatically add a package to /user.json after installing it, and
removing it when uninstalling.
Two bug fixes
Fix bug where putting a package in zedconfig.json doesn't immediately reload config
Avoid some timeouts to work around keyboard handling
Merge branch 'zpm' of git://github.com/zedapp/zed into zedapp-zpm