Merged .emacs
Merge branch 'master' of github.com:seldridge/dotfiles
Merge branch 'master' of github.com:seldridge/dotfiles
Accumulated Spring Updates
Merge branch 'master' of github.com:seldridge/dotfiles

Conflicts:
	.bashrc
	.elisp/verilog-mode.el
	bin/ef
	home_directory/.emacs