Merge pull request #12 from natj/colmaps

colormaps
cleanup of colmaps