I've merged the tags according to [Farseeker's proposal][1]

`esx` → `vmware-esx`  
`esxi` → `vmware-esxi`


  [1]: http://meta.stackexchange.com/questions/54545/sf-retag-esx-and-esxi-to-vmware-esx-and-vmware-esxi/54546#54546