Merge pull request #1 from nelsonni/corpus_refactor

Corpus refactor
Merge pull request #2 from McdonaldSeanp/master

Merge of Sean/Hugh and Nick
removed array of MetaKata objects, streamlined init_file
Merge pull request #2 from nelsonni/master

Bug fix