Add tests for line based diff JS renderer
Merge pull request #150 from tarmstrong/linebased-view-tests

Add tests for line based diff JS renderer
Call addButtonListeners only on merge
Merge pull request #151 from tarmstrong/fix-addbuttonlisteners

Call addButtonListeners only on merge
Fix #152 - Start server for nbmerge when arguments given.
Merge pull request #153 from tarmstrong/start-server-for-arguments

Fix #152 - Start server for nbmerge when arguments are given.