some changes not checked in
Merge branch 'master' of github.com:debrigand/permagarden