Remove nbdiff-type from notebook metadata on merge save.

Fixes #144.
Merge pull request #149 from tarmstrong/remove-nbdiff-type

Remove nbdiff-type from notebook metadata on merge save.