add iterm profile
Merge branch 'master' of github.com:sableloki/dotfiles

* 'master' of github.com:sableloki/dotfiles:
  add iterm profile
alias git merge to gm