Changed nohlsearch to <leader><space>
Merge branch 'master' of github.com:daviesjamie/dotfiles
Stopped mergetool creating .orig backups on merge conflict.