Getting modules self-identifying better
Merge branch 'develop' of git://github.com/johnshopkins/machado into develop
Merge branch 'develop' of git://github.com/johnshopkins/machado into develop
Reconfigure modal HTML