Clean up unused vars.
Refactor local-specific javascript out of nbdiff.js
Merge pull request #165 from tarmstrong/refactor-local-remote-js

Refactor local/remote js
Fixes delay in buttons appearing (flashing) for diff and merge
CSS for fixing delay in buttons appearing
Merge pull request #166 from selenaaa/mult_nbs

Fixes delay in buttons appearing for both diff and merge
Add docstrings to a few functions.
Refactor merge.py, notebook_diff.py, diff.py; add docstrings.
Refactor notebook_diff.py tests into a separate file.
Add test for diff_modified_items()
added some more tests
Fix import of diff() in notebook_diff.py
Merge pull request #167 from tarmstrong/refactor-python

Refactor notebook-specific diff logic out of diff.py into notebook_diff.py
Fix merge conflict.
Remove duplicate tests
Merge pull request #168 from LinaNouh/difftests

added some more tests
Merge remote-tracking branch 'upstream/master' into Webapp-version-merge

Conflicts:
	nbdiff/notebook_parser.py