Merge branch 'master' into pjfranalysis
Removed superfluous parameters from measure_wnrfs
Merge branch 'pjfranalysis' of github.com:ioam/topographica into pjfranalysis