changed faces to work better on terminal
Merge branch 'master' of github.com:rranelli/emacs-dotfiles

Conflicts:
	.emacs.d/init.el