Fixed git.
Merge branch 'master' of github.com:nowells/dotfiles

* 'master' of github.com:nowells/dotfiles:
  Fixed makefile.
  Fixed iterm configuration.