what on earth?
Merge branch 'master' of github.com:saltcod/waterstreetv6

* 'master' of github.com:saltcod/waterstreetv6:
  One more pre-christmas commit
  Pre-christmas commit.
try to wrap Infinite scroll in is_page
try if is archive instead
get rid of the is_archive bit
Disable Jetpack's Infinite Scroll on archive pages for our CPT
Lets try to Merge branch 'master' into christmas

* master:
  Disable Jetpack's Infinite Scroll on archive pages for our CPT
  get rid of the is_archive bit
  try if is archive instead
  try to wrap Infinite scroll in is_page
  what on earth?