set default to rebase for git pulls
add some support for pretty xml im vim