Default to rebasing git pulls.
History in nrepl.
Java dev env working a bit more slickly, via emacs-eclim.