Setting up diffing tool
Adding fonts
Merge branch 'master' of github.com:chauncey/dotfiles