Undoing some broken things so Jen can work.
Merge branch 'david' into jen

Conflicts:
	apps/basicNetwork/v/vpn.clients.php
	node/jainode.js