Changed to Vundle and cleaned up the config a bit.