Merge pull request #21 from andrewjpage/master

Add default memory for annotate assembly conf