Fix Pagination with Query String
needed sanity check for when pretty permalinks ARE enabled
Merge branch 'master' of github.com:jarednova/timber

* 'master' of github.com:jarednova/timber:
  Fix for custom wp-content path