Syntax highlighting for rust
Configure settings specific to slim filetype
Merge branch 'master' of github.com:mcls/dotvim

Conflicts:
	.gitmodules