Making vim indent properly in PHP
Merge branch 'master' of github.com:/v/dotfiles

Conflicts:
	vim/vimrc