Fixed QOS enumeration

Updated QOS enumeration algorithm to use the association manager rather
than connecting to the accounting database
cleaned out match mark comments
added vi .swp files