Show git conflicts with priority
Note that capnp is now brew installable
Fix file browser height for tabs above document

This fixes regression caused by 1de5d90475788143655a60fdbff654139fec3cb4 that
divider height and default compression priority disallowed expected height.
Build instructions: Assume people are using Xcode 5