Copied everything over from gh-pages to allow for easier testing on master branch