Apologies, my working directory changes did not make it into a commit for
the initial submission of this. procline()'s return value was supposed to be changed
to instead use the normal pattern (return of 0 is good/match, 1 is no good/match)

• Fix merge conflicts as a result of rS317254

• Fix (?) ordering

Rewrite/fix the context handling; this was missed because I forgot to change the
atf_expect_fail with rS317051, so I completely broke context handling but missed
it because the tests failed as expected. This version has some added benefits:

• The queue handling for -B was previously done whether we actually cared about context or not; this is no longer the case
• The flow for printing output is a lot more linear and readable, IMO. It's pretty clear now where the matched line is printed and where the context is printed.

This should be the last tweak to this one:

• Simplify even further; ctxover isn't necessary, we can just inspect linesqueued

• Sorry, I lied; simplify context separator bits a little bit further

• More simplification...we can always get better, right?

• Fix one last context nit that we weren't testing for and I stumbled upon; adjacent non-overlapping contexts were still broken

• Further amend tests for two other cases; properly measure gap between context/match by whether we're rotating lines out of the queue or not doing -B matches

• Correct comparison in test for grep type; remnant from a past iteration where this was thought to have failed on multiple types

• Fix indentation while changing line/match references on this line

• Resolve merge conflicts introduced by rS317665
• Also remove the binary check from procline -- this was solely due to context

printing, and it's covered in the setting of the 'doctx' variable introduced in
procfile since it handles all context now.

• Refactor a little bit more to avoid excessive line lengths and wrapping