Testing new local environement

This push and pull is to test the process of updating the trunk from
local Virtual Box (with matching server settings) to git and then to the
sandbox server.