Merge branch 'master' into pg
added tmpfile
added temp file
added temp file
updated multi repo study location indexing
changed study write to use tmpfile
added some new tests for new functionality in git_actions
added read_as_json functionality
pathmaps for json test data
json test data
takes json blob as dict rather than string
changed hardcoded paths to pathmaps
Merge branch 'master' into local

Conflicts:
	peyotl/phylesystem/git_actions.py
typo