rollup
Merge remote-tracking branch 'origin/master'

Conflicts:
	.Xresources
	iterm2/com.googlecode.iterm2.plist
	ssh/config
irsi log highlighting