Fix overlapping contexts issue

This reverts commit 9767bd0f1cf588ff9b5a547cebd1de0ef574bebf.
Start fixing context mess
Make does_match return falsy if we're not matching a regex
Remove TODO for overlapping context test
Fix messed up line counts when using after context
Merge branch 'rhoelz/overlapping-context'