Switched from highlighting to ruler
Merge branch 'master' of https://github.com/alexj136/vim

Mergy goodness