change annotations to use resource attributes machinery
fix annotations spec to reflect changes
Merge branch 'dalek' of github.com:conjurinc/api-ruby into dalek