Squashed version of #278
Merge pull request #290 from hammerlab/add_gene_annotations_squashed

Squashed version of #278: adding gene annotations