Merge branch 'sofix' of git://github.com/DelvarWorld/phantom-proxy into DelvarWorld-sofix

Conflicts:
	lib/proxy.js