Update to latest

- add pyfixer:deprecated-has-key
- timer for light/dark solarized setup (light in daylight)
- some local custom cleanup
Merge branch 'master' of github.com:choppsv1/emacs.d

Conflicts:
	custom.el
	emacs-init.org