Fix breadcrumb when we edit conflict
codemirror size
Since pysvn is not on pypi, we don't want it required.