Add filename of currently diffed or merged notebook to toolbar
Make grunt happy
Merge pull request #195 from tarmstrong/add-filename-to-ui

Add filename of currently diffed or merged notebook to toolbar