columnized slate colorscheme
renamed modified slate scheme to buck
Merge branch 'master' into necromancer
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 necromancer
Merge branch 'necromancer' of github.com:b-ryan/dotfiles into necromancer