routine update
Merge branch 'master' of https://github.com/cmrivers/epipy
Merge branch 'master' of https://github.com/cmrivers/epipy
fixed color assignment for user-provided colormap