updated iterm2 build 2.0 preferences (with better colors)
Merge branch 'master' of https://github.com/edwelker/nix_conf