Removing some of the bundle that were causing problems. tweaks to git, screen, and vim
pull and resolving conflicts.
Re-adding some bundles, adding some colour schemes.