Rename merge_script.js to nbdiff.js.
Rename save_merging_to_ipynb() function to nbmerge_save()
Move javascript init to bottom of file.
Merge branch 'master' into refactor-js
Merge branch 'master' into refactor-js
Server shutdown callback
Refactored merge js
Function to set attribute
Finish refactoring nbdiff.js
Add merge button click handlers
Merge pull request #109 from MandMk/webbrowser-open-automatically

Browser opens automatically when nbmerge is called
Merge pull request #110 from selenaaa/server_stuff

Server shutdown callback
Fix #101 and 107 - deleted and empty cells should be removed from final merge result
Merge pull request #112 from tarmstrong/refactor-js

Refactor JS
Change nbdiff to use NbFlask.add_notebook() as well.
Fixes #116. Click handler broken on Firefox.
Fix imports for fresh install
Merge branch 'master' of https://github.com/tarmstrong/nbdiff into webbrowser-open-automatically

Conflicts:
	nbdiff/commands.py