Change .emacs font directive to just set size
clean up .emacs comments
Merge branch 'master' of github.com:Frencil/dotfiles

Conflicts:
	.emacs