Merge pull request #37 from georgecrawford/master

Update master with examples from gh-pages
Merge pull request #39 from georgecrawford/master

Small tweaks to margin collapsing