Add initial version of overlapping feature resolution.
Fix rRNA command line processing bug.
Merge branch 'master' of git.kbase.us:genome_annotation
Merge branch 'master' of github.com:kbase/genome_annotation