More version fixes (temp)
Merge branch 'new-version' of github.com:ioam/topographica into new-version
Merge branch 'master' into new-version
Merge pull request #522 from ioam/new-version

Old version-handling fixes from wiktor