Collapse Saturday and Sunday

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

Collapse the weekend by default
Merge branch 'master' into complete-test-suite

Update code to avoid merge conflicts.

Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>