Update Formo - include some recent patches/improvements.
Merge pull request #31 from shadlaws/formo_20130512

Update Formo - include some recent patches/improvements.