added json format for openfmri terms corresponding to cognitive_states/mental_concepts.txt
some strange conflicts on tacc git