commit changes
Merge branch 'master' of github.com:benwbooth/dotfiles

Conflicts:
	.lein/profiles.clj