Added custom yasnippet snippet directory

An update hosed all my previous snippets; I was just placing them in
the main elpa directory. Maybe I should do it right the first time...
Added zap-up-to-char function and keybinding
Merge branch 'master' of https://github.com/garslo/emacs-config

Conflicts:
	Modes.el