Revert "use vim yaml for salt files, change cc=80, change theme"
as yaml.vim is not better than saltvim

This reverts commit a1f0b1b213e794e633c8c356276f7014296418c2.

Conflicts:
	vimrc
colorschem to torte