Update new package and new fixer
Merge branch 'master' of github.com:choppsv1/emacs.d

Conflicts:
	custom.el