Remove nbdiff/make_merge_conflict.py -- it should be in a tools folder.
Remove nbdiff/extension. The actual code is in extension/