major cleanup almost ready to release
Merge branch 'homefresh' into testing