master updated

matched gh-pages recent version
clean up

cleaned up commented-out and got rid of sass file but kept css file