New Homepage. Closes #322.
Merge branch 'master' into testing