Added a couple caps keymaps to handle case where caps lock is
accidentally on.
Added def advice for vc-annotate.
Added rename-file-and-buffer function
Added back-button mode
Merge branch 'master' of github.com:choltz/emacs-config

Conflicts:
	init.el