Updated to master

Also hoping to force Github Jeckyll to rebuild