remove active so the symlink doesn't break every time I commit
Merge branch 'master' of github.com:simonhicks/dotfiles

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

Conflicts:
	vim/ftplugin/clojure.vim
remove applescript
Merge branch 'master' of github.com:simonhicks/dotfiles

Conflicts:
	scripts/resources/open_iterm_window.scpt