Copied final edits over from gh-pages branch

I've been accidentally commiting most my work this week to the gh-pages
branch by mistake.  This commit finally brings all of the work over to
the master branch