adds class-level annotations and pushes state variable annotations down into a nested dict whose key in the class annotations is 'vars'
Merge remote-tracking branch 'anthony/anno' into develop