Fixed term cursor colour + a few tweaks
Merge branch 'master' of https://github.com/cramsay/dotfiles