hide edit controls for picker
add notish thing 'teachers guide
hide again stuff we do not need now
Merge branch 'github-refactor-oerpub' of https://github.com/oerpub/github-book into github-refactor-oerpub
Merge branch 'github-refactor-oerpub' of github.com:oerpub/github-book into github-refactor-oerpub
Merge remote-tracking branch 'origin/phil-add-button-fixes' into github-refactor-oerpub
Merge branch 'github-refactor-oerpub' into phil-add-button-fixes
fix semantic block drag/drop
Merge remote-tracking branch 'origin/phil-add-button-fixes' into github-refactor-oerpub
Open with picker closed, TOC open
Rename "minimize" to "toggle" for workspace and toc

Because that's what it actually does.
fix typo
Merge remote-tracking branch 'origin/phil-add-button-fixes2' into github-refactor-oerpub
Merge branch 'github-refactor-oerpub' into phil-idempotent-save

Conflicts:
	scripts/views/workspace/content/aloha-edit.coffee