refactoring and other changes
Merge branch 'master' of https://github.com/bsku002/.emacs

Conflicts:
	ac-comphist.dat
	elpa/archives/gnu/archive-contents
	elpa/archives/melpa/archive-contents