1418062403: Proposed update from latest drops and data_starter's qa
Merge pull request #7 from NuCivic/update_from_latest_drops_n_data_starter_1418062403

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