Update Formo - two bugs fixed, patches pushed upstream to the Formo project
Merge pull request #24 from shadlaws/formo_patches_20130502

Update Formo - two bugs fixed, patches pushed upstream to the Formo project.