Switch to using meld for diffs and merges.

 * matlab alias for CTCMS

 * add .cabla path???

 * switched merge tool to meld

 * different color prompt for Git

 * using meld for diffs

 * comment out IPython prompt