break out cfa & okf, script updates
add type blocks to civic hackers
add in cfa, duh
Merge pull request #278 from github/cfa-okf-breakout

Break up Civic Hackers, Script CFA Updating