Merged in my chages to vimrc.bundles
Tweeked some settings