For problem 1, I use this extension https://chrome.google.com/webstore/detail/octosplit/mnkacica... It's not quite the side-by-side diff that I want (like Meld http://meldmerge.org/) but it does help.