Tidied up vimrc

Modified status line to be color coded, added git branch info and column
number. Removed a bunch of cruft and added colorcolumn at 80