Updated oh-my-zsh and new theme

The change to jellybeans in vim has prompted me to start looking at
different colours for my shell prompt. Which led to updating to the
latest version of oh-my-zsh.
Switch to development version.

I've upgraded/reverted some of the changes from my previous version of
oh-my-zsh into the new version (faster git, better vi support) into my
development branch.