Updates to website after various renaming
Merge pull request #233 from niksoper/gh-pages-dev

Updates to website after various renaming
Merge branch 'upstream' into gh-pages-dev