Added bondType attribute to the element type.  Also changed the name of the enumeration to bondState to be more accuratly named