Master to pull into gh-pages

this will sort it out.  you may not see much on the ipad.