fix fish incompatibility
add rust.vim

https://github.com/wting/rust.vim
add some php-specific stuff
Merge remote-tracking branch 'origin/master' into merge

Conflicts:
	.gitmodules
rm dash leader
sort
Merge branch 'master' into merge
Merge pull request #1 from perfmode/merge

merge into master