stuff
Merge branch 'master' of github.com:simonhicks/dotfiles

Conflicts:
	scripts/resources/open_iterm_window.scpt