Don't show trailing whitespace in haskell-interactive-mode
Safer definition of sanityinc/eval-last-sexp-or-region
Merge remote-tracking branch 'origin/master'