Cool changes to irbrc (poss duplicate of other branch) and attempt to workaround el-get problem...
Replicated other changes - to el-get-setup
Merge remote-tracking branch 'refs/remotes/origin/jn-big' into new-master

Conflicts:
	.emacs.d/init-files/hals-el-get-setup.el
Merge remote-tracking branch 'refs/remotes/origin/jn-little' into new-master

Conflicts:
	.emacs.d/init-files/hals-el-get-setup.el