1415996817: Proposed update from latest drops and data_starter's qa
Merge pull request #5 from NuCivic/update_from_latest_drops_n_data_starter_1415996817

1415996817: Proposed update from latest drops and data_starter's qa