Merge policy

I'd like to propose that all merges are squash merges when notebooks are involved.  Working on a long tutorial in notebook format results in zillions of changes that are collateral damage of editing a single cell.  If we do complete revision history merges, this repo will get big fast. 

Thoughts?