Merge branch 'master' into featuremapper
Merge branch 'master' into featuremapper
Merge branch 'featuremapper' of github.com:ioam/topographica into featuremapper