Adds VLAN to cci/hardware details

Note: Also fixes status not being masked in for CCIs. Part or all of #84.