Merge pull request #84 from jpecht/master

zoom based on county area / tweaked tooltip positioning
Merge pull request #85 from jpecht/master

reorganization/clean up
tooltip styling
Merge branch 'master' of github.com:nikAleksandr/CIC
tooltip styling for secondary indicator.  can use a similar strategy to slectively target primary or secondary indicators
new text for secondary indicator reset.  moved CData into data folder and updated links
Merge remote-tracking branch 'upstream/master'

Conflicts:
	js/main.js