Better emacs defaults
Argh, a wild merge appeared!