Add --check argument for profiling/testing purposes.
Run nbdiff and nbmerge commands on travis.
Fix test-merge script.
Configure git in travis build so the scripts work.
Remove python 2.6 from build.
Merge pull request #172 from tarmstrong/test-commands-travis

Run nbdiff/nbmerge commands in travis build