Merge branch 'master' into master

.gitattributes

@@ -0,0 +1 @@
+alternate_formats/* -diff

.travis.yml

@@ -14,6 +14,7 @@ script:
  - pyflakes .
  - python test/are_files_linted.py
  - python test/validate.py
+ - python test/test_json_matches.py
 
 notifications:
   email:

README.md

@@ -471,10 +471,13 @@ The following script takes one required command line argument
 
 * `icpsr_ids.py`: Updates ICPSR ID's for all members of the House and Senate in a given congress, based on roll call vote data files stored by Voteview.com. The script takes one command line argument:
 --congress=congress_number
-where congress_number is the number of the congress to be updated. As of July, 2013, the permanent URL for future roll call data is unclear, and as such, the script may need to be modified when it is run for the 114th congress.
+where congress_number is the number of the Congress to be updated. As of July, 2013, the permanent URL for future roll call data is unclear, and as such, the script may need to be modified when it is run for the 114th congress.
 
 The following script may be run to create alternatly formatted data files. It takes no command-line arguments.
-* alternate_bulk_formats.py creates four files (two each for current and historical legislators) in json and csv formats. The csv files do not include all fields from the legislator yaml files, and include data from the social media yaml. All four files are stored in the ~/alternate_formats directory.
+
+* `alternate_bulk_formats.py`: creates four files (two each for current and historical legislators) in CSV formats. The CSV files do not include all fields from the legislator YAML files, and do include data from the social media YAML. All four files are stored in the `alternate_formats/` directory.
+
+For each YAML file, there is a matching JSON file in the `alternate_formats/` directory, that should remain up to date automatically when the YAML file is updated through scripts. If you hand edit a YAML file, run `generate_json.py` to update these JSON files before filing a pull request (if you don't, the Travis tests will fail and the maintainers will ask you to do so anyway).
 
 Other Scripts
 ----------------------