Default to opendiff as git merge and diff tool
Update pryrc to use updated CodeRay color customizations