Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:bsplay/nbdiff
README and usage message updates
Merge pull request #103 from tarmstrong/new-readme

README and usage message updates
Merge remote-tracking branch 'upstream/master'