Merge branch 'master' into 370-add-analytics #1306

Job	Run time
build_neurosynth_compose	1m 31s
clean (neurosynth_compose)	4s
clean (compose_nginx)	3s
clean (compose_pgsql)	3s
clean (compose_worker)	3s
clean (neurostore)	4s
clean (store_nginx)	4s
clean (store_pgsql)	9s
build_neurostore	27s
style_check	10s
neurostore_backend_tests	4m 20s
neurosynth_compose_JUNIT_tests	5m 36s
neurosynth_compose_cypress_tests	11m 6s
neurosynth_compose_backend_tests	2m 44s
	26m 24s

Provide feedback