Add nose-cov to travis build
mess with coveragerc
Add tests to include path
Merge pull request #194 from Shurouq/master

More test cases
Fix #183 - fix diff on empty lists
Add comment for regression test in test_diff
Add filename of currently diffed or merged notebook to toolbar
Fix #196 - merging empty notebooks
Add empty notebooks with modified name to test cases.
Make grunt happy
Fix flake issues in merge empty notebook tests
Merge pull request #197 from tarmstrong/merge-empty-notebooks

Fix #196 - merging empty notebooks
Merge pull request #195 from tarmstrong/add-filename-to-ui

Add filename of currently diffed or merged notebook to toolbar
Merge branch 'master' into test-empty-merge-notebooks
Merge pull request #189 from tarmstrong/coverage

Add nose-cov to travis build
Merge pull request #198 from tarmstrong/test-empty-merge-notebooks

Add empty notebooks with modified name to test cases.
Fix #183 - diffs with empty lists work even when one contains elements
Remove print statements
Merge pull request #199 from tarmstrong/merge-test-cases

Merge test cases
Refactor merge out of notebook_merge