Added short_bio field to person.
Updated machado.
Resolved merge conflicts.