Refactor defaults setting (was on wrong event), move declarations around a bit

Conflicts:
	vimrc
Switching to Vundle

Conflicts:
	vimrc
Fix broken Bundle def