Remove foundation pagination, replace with default config setting
Merge branch 'pagination'
Merge remote-tracking branch 'upstream/master' into update
Merge branch 'update'