Make sure homepage JS is only run on homepage
Merge remote-tracking branch 'upstream/master'