Better error msg for bad annotation input (#159)
Merge branch 'master' of github.com:PGFI/rum