Fixing broken merge with this file
Replaced huayan string for GALAXY_USER with @user@ so the value of the username key from build.properties is used.
Added steps to include the contiguator tool in the galaxy build process
Various bus fixes for release 20030308