A few fixes for pr #90 and removing the extension folder which we are no longer using.
Don't use 'side' for diff cell metadata. It doesn't have any meaning.
Merge pull request #94 from tarmstrong/cell-diff-ui-js

"Changes made to the merge_script.js for the cell diffing ui" + some fixes
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