first pass at adding color bar
clean up
cleanup
remove unused lines
clean up
Merge branch 'colorbar'