add an alias
Merge branch 'master' of https://github.com/wiltzius/wiltzius-preferences

Conflicts:
	iterm/com.googlecode.iterm2.plist