more
Merge branch 'master' of github.com:pepegar/dotfiles

Conflicts:
	vim/snippets/php.snippets
	vim/vimrc