2.00a

Attempting to fix gh-pages.
Merge branch 'master' into gh-pages