formatting and shit
Merge branch 'master' of github.com:zeezali/vimrc