Attempt to resolve messy left over merge.
colour-dump: Attempt to be smart with pipes.
macros: Remove some sketchy code.
zshrc: cd .. shortcut
vim: Add Isabelle ROOT syntax.