Cleaned up includes.
Merge branch 'gh-pages' of github.com:parklab/comparative-website into gh-pages