Branch/unit props

@eric79 @youngca 
Adds echelon and affiliation properties to the unit component