More edits to the setup scripts. Not certain this will work on Vagrant yet, but our in-place server finally seems happy.