Added colormake config.
Small change to aliases.
Updated setup script.

Added overwrite of colormake configuration (if colormake is installed, of course).
Merge branch 'master' of https://github.com/algan/setup