Always use multiline message if not in short mode
Make source line recognition take into account stacktrace already mangled by other component, like coffee-script
Merge branch 'output-formatting'