merge, resolve conflicts
merge and resolve conflicts
BUG: update deprecated pandas interface
Merge branch 'master' of git@github.com:aflaxman/gbd into hannah_gfx
BUG: update to work with modern pandas
DOCS: extend a little
ENH: make data loading compatible with latest pandas
Merge branch 'upstream'