renamed a variable, comments
Merge remote-tracking branch 'origin/master'

Conflicts:
	j/config/auto.sh/git_aliases
moving <Space> to the end was unwise!
Mac notes