Updated to brand new emacs config
a JRuby option, and coloring for git diffs