ghci stuff
Additional mods.
Updates.
Merge branch 'master' of github.com:igraves/dotfiles

Conflicts:
	etc/bashrc
	etc/vim/vimrc