Merge remote-tracking branch 'upstream/master'

Merge pull request vmware#319 from tianhao64/master

Doc update for 6.0

Merge pull request vmware#175 from hartsock/v5.5.0.2014.1.1

Change version conventions

Merge pull request vmware#148 from hartsock/master

Portable tests

Update README.md

Fix broken link to the release notes.

5.1.0 -> 5.5.0

This is actually from vSphere 5.5.0. My bad.

Fix trailing whitespace