Added TB/HIV, renamed chunks and figs according to knitr recommendation.