Add config for pentadactyl
Change git merge tool to terminal vim