webkitgtk rbrb
resolve conflict with mdocml
Add conflicts to python-make and fix tabbing