added checks for vlan support (reduce false fails)
Merge pull request #75 from daniellemayne/2014.05

added checks for vlan support (reduce false fails): 2014.05