remove keybinding bugs
Merge branch 'master' of github.com:NStal/emacs-config
Merge branch 'master' of github.com:NStal/emacs-config

Conflicts:
	plugins/yasnippet/snippets/sgml-mode/template.yasnippet
	plugins/yasnippet/snippets/text-mode/html-mode/html.yasnippet