- updated index to properly reflect what this is
Merge branch 'master' into gh-pages
Updated documentation.