Merge remote-tracking branch 'upstream/master'
Remove IPython toolbar and replace it with our own. refs #95
Merge pull request #97 from tarmstrong/nbdiff-toolbar

Remove IPython toolbar and replace it with our own.
Save notebook for merge. (not working)
Use git-ls-files to find modified notebook.
Flake8 style fix
Merge pull request #98 from tarmstrong/nbdiff-from-git

Use git-ls-files to find modified notebook
Fix. Added save_notebook() to commands.py
moved and renamed check_modified method to comparable.py and
added check modified parameter to diff function
added method to compare lines of modified cells
small fixes
Create line comparator and added tavish's tests
Update requirements.txt to include flask, jinja2 dependencies.
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
Rename merge_script.js to nbdiff.js.
Rename save_merging_to_ipynb() function to nbmerge_save()
Move javascript init to bottom of file.
Merge remote-tracking branch 'upstream/master'