Cleans up the vimrc a bit.
Cleans up the vimrc and bundles a bit and changes the buffer swither
mapping back to the old one which was used with lust juggler.