Merge 'upstream' into gh-pages-dev
Update to match boolean naming changes

Imports the new framework, and updates our own usages to match the API
Update to reference interactive axes
Merge pull request #139 from tpkelly/gh-pages-dev

Update website with boolean names