Refactor merge out of notebook_merge
Add unused check_modified arguemnt to merge functions
Merge pull request #200 from tarmstrong/moar-merge-test-cases

More merge test cases