allowing for disabling annotations
Merge branch 'colors' of github.com:klanoma/annotator into colors