Merge pull request #1 from openaddresses/master

Merge from upstream
Rename sources in California with _county suffix where needed, for clarity.
Merge pull request #301 from louh/rename-counties

Rename source files in California with the _county suffix where needed, for clarity.