Merge branch 'master' into enh/private_collections
Merge branch 'enh/private_collections' of https://github.com/chrisfilo/NeuroVault into enh/private_collections
Merge branch 'enh/private_collections' of https://github.com/chrisfilo/NeuroVault into enh/private_collections
fixed mime types for pycortex
Merge branch 'master' of https://github.com/chrisfilo/NeuroVault