Various changes.
Merge branch 'master' of github.com:/shanqing-cai/rhythm-fmri