Update news stuff on mac
Emacs stuff on work machine
Remove ksmserverrc from Git
Merge branch 'master' of github.com:rrix/dotfiles

Conflicts:
	.emacs.d/norang.el
	.kde/share/config/ksmserverrc
	News/nnimap+personal:INBOX.SCORE
	News/rss/nnrss.el