updates from rotkohl
Merge branch 'master' of github.com:benjaminfjones/dotfiles-galois

Conflicts:
	ghci