Merged doctest support

Merged doc tests now mean the doc test -> line resolution stuff doesn't work perfectly as expected. (For accountability I aim to tackle this Oct 24th)