Cleanup
Merge branch 'master' into resumator-settings

Conflicts:
	com.googlecode.iterm2.plist