Merge pull request #64 from parrt/master

Include migulorama in contrib file, bump version, some trivial reorg.