Merge pull request #353 from jpecht/master

gitignore update
added countytracker
Merge remote-tracking branch 'upstream/master'
tweaks
ability to default map to custom indicator