removed 80 char limit
Merge branch 'master' of github.com:negativetwelve/dotfiles

* 'master' of github.com:negativetwelve/dotfiles:
  fixed solarized on ubuntu
  updated vimrc
  fixed git configs again
  fixed merge settings