Merge gh-pages into master for fun and convenience and profit