Merge branch 'master' into multiple_notebooks
Fix javascript style issues, modify test notebooks.
Merge branch 'multiple_notebooks' of github.com:selenaaa/nbdiff into multiple_notebooks