configure aloha to use drag/drop blocks
rejigger aloha initalization process
remove some unused markup
Merge branch 'github-refactor-oerpub' of github.com:oerpub/github-book into github-refactor-oerpub
uncomment save
whitespace
resolve merge conflicts, sidebars scrollable
Merge branch 'github-refactor-oerpub' into phil2
Merge remote-tracking branch 'origin/phil2' into github-refactor-oerpub
merge github-refactor-oerpub and fix merge conflicts