Some useful settings.
Various ways in which I have been placating bash (and my workflow) on Eris.
Various changes I have accumulated in my .emacs file.
disable a bunch of unused extensions.
Merge branch 'master' of github.com:pnkfelix/DotFiles

Conflicts:
	bashrc
	emacs
generalize gitconfig to work on my other user accounts.