Add filename of currently diffed or merged notebook to toolbar
Fix #196 - merging empty notebooks
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