updated vimrc to work with colorcolumn
Merge branch 'master' of github.com:johnnygaffey/dotfiles