Merge pull request #267 from jpecht/master

none datatype fix / binary bug fix / csa title fix
non-3069 county fix
help pagination resets
Merge remote-tracking branch 'upstream/master'