Fixed issue with action attrs gobbling regular attrs

Closes #90
Merge pull request #105 from machty/attr-order

Fixed issue with action attrs gobbling regular attrs