Added spec for new and old attributes syntax
Merge remote-tracking branch 'skalar/version2' into version2