Merge branch 'master' of https://github.com/jmcarp/neurotrends
Merge branch 'master' of https://github.com/jmcarp/neurotrends