update install process
add kdiff as mergetool
interesting tidbits from mathiasbynens