Various edits
Merge branch 'master' of https://github.com/tyrust/dotfiles

Conflicts:
	home/.emacs.d/ttt-lisp/custom.el