Added crop size and alignment to embedded images -- closes #147
Merge branch 'develop' of git://github.com/johnshopkins/machado into develop