Merge branch 'Automate-Expanding/Collapsing'

Conflicts:
deckster.coffee