make jquery cdn https
some timing fixes
merge
Merge branch 'master' into gh-pages
formatting