Merge branch '2.0.x'
Merge branch '2.0.x'
Merge branch '2.0.x'
Merge remote-tracking branch 'origin/2.0.x'
hotfix for unusual but terrible content conflict
Merge branch '2.0.x'
Update for more extensive article tags fix

Why isn't htmlchecker closing open article tags...
A fix for metastate misfires

In cases where the metastate is set before a broken process completes
(rare but it happens) and the check values are not matching the
retrigger values, check against the time and, if it has been more than
24 hours, reset the check values, turn off chunking, and reset the check
values in the metastate. Next metastate check should retrigger the
retrieval process.
Update to contain major fixes

Assuming the latest article tags fix works, that combined with the
metastate fix constitutes a major enough upgrade to issue a significant
tag.
Improved PHP 5.4 standards compliance
Whitespace cleanup
Patch for 3.6
Noting ver change for upcoming tag.
Merge branch '2.0.x'
Merging in fixes, improvements from 2.1.x

Prep for release.
Merge branch 'master' of https://github.com/PressForward/pressforward
Merge branch '2.0.x'
Merge branch 'master' into 2.1.x