inconsolata looks bad on my laptop
Merge branch 'master' of https://github.com/nathanalderson/dotfiles
Merge remote-tracking branch 'origin/master'
default tab widths for various file types
Merge remote-tracking branch 'origin/master'