Fixed IRC
Merge branch 'master' of github.com:dparnell/emacs_config
Merge branch 'master' of github.com:dparnell/emacs_config

Conflicts:
	init.el
Fixed IRC

Conflicts:

	init.el