annotation and kmer fixes, new unittests
Merge branch 'master' of https://github.com/biocad/au-summer-2013