.vimrc revamp
better line highlighting and organization
merge master