Moving edits from gh-pages to master. Also, again, @pierceray is always right.