Updated generic to support annotate step, updated config file for spades to match new syntax