Re-default attributes to properly account for overrides
Merge pull request #56 from chrisroberts/enhancement/attr-prop

Re-default attributes to properly account for overrides