Integrated changes thought of during boring ethics class.
Whatever I had at the moment. Been a while since I've worked on my .emacs.