Restore initialisation (lost to merge)
Insist on only finding basenames
Bring tests up to date
Merge branch 'master' into move_to_git
Move more commands from svn ->git

Separate the commands into "s..." and "g..." as I may need to use both
Remove redundant functions