changed naming convention of my working copy
huh
added support for pushing json to an httpProcess
finished changes to external
Revert "finished changes to external"

This reverts commit 14f64e50d15c2711e5063743022e8421f4c3eeed.
Merge branch 'master' of github.com:nangus/phantomjs-tools

Conflicts:
	common/util.noj.1.js
	external/external.noj.3.js