Add alternate

Conflicts:
	vim/bundle/tagbar
Remove clang_complete and supertab
Add YCM
Restore astyle mapping