Add first implementation of add-metadata cli
Reorganize pyqi stuff
Merge pull request #156 from jrrideout/death-march

Death march