allow different environments to specify editor for git commits
upgrade to latest lein-autoexpect
Merge branch 'master' of github.com:jakemcc/dotfiles

Conflicts:
	lein/profiles.clj
Merge branch 'master' of github.com:jakemcc/dotfiles
add script for killing emacs daemon