Fixed expression in previous commit
Merge branch 'master' of github.com:ioam/topographica
Fixed git-based version info code to work outside main directory, and clarified docs