Change: Update links to vagrant environment for 3.6.0-2
Change: Improve description of behaviour for users policy => "locked";

The documentation did not specify what would happen if the user already
existed, vs if the user did not already exist.
Merge pull request #871 from nickanderson/cleanup-users-policy-locked

Change: Improve description of behaviour for users policy => "locked";
Merge pull request #856 from nickanderson/vagrant-3.6.0-2

Change: Update links to vagrant environment for 3.6.0-2