Add file/line number to log message format.

Add the "shortfile" tag to the log message format, which adds final
component of filename path and line number.

Also a bit of rearrangement of info and whitespace.