further php snippet improvements
once again improved php completion
added dwm.vim
removed delimit mate
removed snippets
added UltiSnips plugin

Conflicts:
	vimrc
fixed up all the php snippets
further php snippet improvements
once again improved php completion
added dwm.vim

Conflicts:
	vimrc
Merge branch 'master' into work

Conflicts:
	vimrc