catch up master to gh-pages

on a side note we should use master to commit to, and an admin should push to gh-pages