Merge changes from gh pages to master

Final changes were made in gh pages not master.  Merge back