Remove nesting of AttrAnd and AttrOr in Attr base
Remove nesting of AttrAnd and AttrOr in Attr base

This changes the base Attr class so doing `and_(Attr, AttrAnd)` does
result in nested AttrAnd or AttrOr objects.

dpshelio/sunpy,dpshelio/sunpy,dpshelio/sunpy