Various changes.
Merge branch 'master' of github.com:jamesread/upsilon

Conflicts:
	upsilon-node/upsilon-jar/var/tools/upsilon-get-command