use sneak and remove conflicting settigns
Merge branch 'master' of https://github.com/gilligan/.vim

* 'master' of https://github.com/gilligan/.vim:
  kalay changes