Run nbdiff/nbmerge commands in travis build

* Create `make_diff.sh` and `make_merge_conflict.sh` scripts to automate running test scripts.
* Add these scripts to the build.
* Add `--check` arguments to `nbdiff` and `nbmerge` that allow for a headless run of the program for testing.