updates
Merge branch 'master' of https://github.com/law826/Neurosynth_SNA

Conflicts:
	database.pyc