upgrade keyfreq
plain text use emacs keybindings
typo in snippets
more django snippet
typo in README
hotkey for cb.el
Merge branch 'master' of https://github.com/redguardtoo/emacs.d

Conflicts:
	init.el