[erc] erc-terminal-notifier as submodule
[OSX] fix load PATH location
Merge branch 'master' of github.com:jeroentbt/.emacs.d

Conflicts:
	conf/_packages.el