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.
Use git-ls-files to find modified notebook.
Merge pull request #98 from tarmstrong/nbdiff-from-git

Use git-ls-files to find modified notebook
Update requirements.txt to include flask, jinja2 dependencies.
README and usage message updates
Merge pull request #103 from tarmstrong/new-readme

README and usage message updates
Add make_merge_conflict.py to scripts/ folder
Merge branch 'master' of github.com:tarmstrong/nbdiff
Make make_diff.py file
Add readme explaining scripts/ folder.
Merge pull request #99 from selenaaa/savenb

nbmerge: save notebook to disk after successful merge
Removed print statements