Original commit on little box
Renamed original files
Merge branch 'new-master' into jn-little
Merge branch 'jn-big' into jn-little

Conflicts:
	.bashrc_original
First changes - for GNOME/Ubuntu environment
A bunch of emacs changes - mostly unix specific
New emacs initialization files macros and site/environment specific code
Minor changes - add $HOME/bin directory to path, irb completion
Merge remote-tracking branch 'refs/remotes/origin/jn-little' into new-master

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