Update iTerm preferences to use previous session's directory
Merge branch 'master' of https://github.com/jeffcole/dotfiles

Conflicts:
	Library/Preferences/com.googlecode.iterm2.plist