Revert "Added supertab"

This reverts commit ec15b79ee5939105eeebbe19e45c6fb54867a620.

Conflicts:

	.vim/bundle/supertab
	.vimrc
Minor changes
Merge remote-tracking branch 'origin/master' into tmp

Conflicts:
	.bash_aliases
	.gitmodules
	.vimrc