changes to handle new annotation format
fix scoping bug preventing commit from working
Merge branch 'master' of ssh://git/srv/git/genome