Used os.walk to recurse into folders
Shift inline css to a new style.css file in Disease template
moved location_id to link table
Merge pull request #36 from MasterPlanner/staging

Used os.walk to recurse into folders
Merge pull request #41 from svineet/svineet_staging

Shift inline css to a new style.css file in Disease template
Add vulnerability countries deployment_setting
Merge pull request #44 from svineet/svineet_staging

Add vulnerability countries deployment_setting
@Todo task not for GCI
Merge pull request #46 from samsruti/samd_main

@Todo task not for GCI
Merge pull request #40 from anurag-ks/anurag_staging

moved location_id to link table
Merge pull request #42 from samsruti/master

Merged from @samsruti for GCI Task http://www.google-melange.com/gci/task/view/google/gci2014/5292591847309312
todo task for gci to elaborate fields