Disabled ai and si
Merge branch 'master' of github.com:ReAzem/dotfiles

Conflicts:
	.vimrc