Updated everything to reflect changes from gh-pages