Updated documentation
Merge branch 'master' into gh-pages
Merging master into gh-pages to push to github pages.
Updated github pages branch.. again