Add less config; tweak gitconfig
Merge branch 'master' into macosx