Use diff3 for merge conflicts
Merge branch 'personal' of github.com:taheris/dotfiles into personal

* 'personal' of github.com:taheris/dotfiles:
  Add ATI power management aliases and coloured directory listings
  Fix merge conflict
  Sneak: hit Space and type two letters to quickly jump somewhere
  Removed mapping; doesn't exactly work. You can still use Ctrl-R when in :ex mode
  Added Ctrl-R, reverse history search for :commands
  Fix docs