wip
Merge branch 'develop' of github.com:michaelaye/diviner into develop
Took 'theirs'.
Conflicts:
	notebooks/analyses/metadata plotting.ipynb