Generated gh-pages for commit af69761
Merge: 288e5bb 1e19c01
Author: Justin Kitzes <jkitzes@berkeley.edu>

    Merge release 0.2 changes from 'develop'