Bring in keyfreq package
Work around smart-mode-line bug. Merge changes from the office.
Reference the sml bug I'm working around.
Merge branch 'el-get' of github.com:tobytripp/emacs.d into el-get

Conflicts:
	lib/modeline-custom.el
	packages.el