Py3 notimplemented bug and empty diff newlines

(should add unit test for the no lines thing...)