Merge branch 'master' of github.com:ioam/topographica
Using resolve_path for opening JSON file
Merge remote-tracking branch 'origin/master'