Add second notebook to merge conflict script.
Rewrite make_diff.py
Refactor file copying in scripts/
Update make_merge_conflict.py to work with mercurial
Merge pull request #162 from tarmstrong/test-scripts-multiple-notebooks

Change test scripts to add more than one test notebook per repository