Merge pull request #217 from andygup/update_gh-pages

Update gh pages
Merge branch 'refactor_ghpages' into gh-pages
Merge branch 'master' into gh-pages
Merge pull request #240 from andygup/gh-pages

Update gh-pages
Merge branch 'fix_gh-pages' into gh-pages
Merge pull request #246 from andygup/gh-pages

Updates gh-pages to v2.1.1
Merge branch 'master' into gh-pages
Merge pull request #251 from andygup/gh-pages

v2.2 updates for gh-pages
updates submodules - missed including this in v2.2
Merge pull request #252 from andygup/update_submodules

Update submodules