Makefile: Separate out commit rule
Merge branch 'master' into colormap
Add colorbar