Changes made to the merge_script.js for the cell diffin ui
Fixed the errors that were in the code
I hope it's all ok now
Revert "I hope it's all ok now"

This reverts commit 02876a440f0e3604c2acd86afbfbf8cd216ac113.
Merge branch 'master' of https://github.com/tarmstrong/nbdiff into cell-diff-ui-js
Fixed the = issue
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