Improved vimrc structure
Removed comments from Bundle lines that caused problems