Updating all the stuff. Tagging 2.0.
Merge branch 'master' into gh-pages