Collapse Saturday and Sunday

Also fix broken collapsing code
Merge pull request #64 from kotct/collapse-weekend

Collapse the weekend by default