added a cool new custom merge tool
paging is better, ipython works