turn off expanders
updated jail data by adding the ccj data to open section and redacting foia data by that much
Merge pull request #157 from bepetersn/master

turn off expanders; do a final update to jail data, with the open data from ccj project
a few tweaks to pages, better comments in macros section
Merge pull request #158 from bepetersn/master

a few tweaks to pages; better comments in macros section; better jail_rail copy
Fixed merge conflicts