Added support for appending the category and/or file of the message
Added tests for line-wrap