Latest iterm
Merge branch 'osx' of ssh://github.com/kevincolyar/dotfiles into osx

Conflicts:
	iterm/com.googlecode.iterm2.plist
Merge branch 'osx' of ssh://github.com/kevincolyar/dotfiles into osx
.gitignore update
Merge branch 'osx' of ssh://github.com/kevincolyar/dotfiles into osx

Conflicts:
	.gitignore
	iterm/com.googlecode.iterm2.plist
Updates ssh rc