Added vim-slim.
Re-added indentation rules for CSS and JS.
Merge branch 'master' of github.com:YorickPeterse/dotfiles

Conflicts:
	.gitmodules
Merge branch 'master' of github.com:YorickPeterse/dotfiles
Updated Syntastic.