Fixes #181
Used alt_headline /alt_name instead of headline/name by default.
Merge branch 'develop' of git://github.com/johnshopkins/machado into develop
Fixed shortcodes.