Merge pull request #74 from seancarr/master

add Attributes subclass to models