clean out cruft
Merge remote-tracking branch 'origin/master'