Updates
Merge branch 'master' of github.com:tmcinerney/dotfiles

Conflicts:
	applications/iterm/com.googlecode.iterm2.plist
	applications/sublime/Preferences.sublime-settings