iTerm settings. Trying to get fonts for airline looking ok.
Vim stuff tmux stuff.
Merge branch 'master' of github.com:trq/dotfiles

Conflicts:
	com.googlecode.iterm2.plist
	vimrc