custom safe themes
Merge branch 'master' of https://github.com/ccann/emacs

Conflicts:
	.gitignore
	init.el
	lisp/custom.el
remove custom.el from source control