Fix conflicts between my changes and James' changes (he added comments, and copied over launch.sh in a different way)
Fix conflicts between my changes and James' changes (he added comments, and copied over launch.sh in a different way)

Merge branch 'master' of ammo.isis.vanderbilt.edu:/isis/git_repos/ammo

Conflicts:
	Gateway/build.xml

isis-ammo/ammo-gateway,isis-ammo/ammo-gateway,isis-ammo/ammo-gateway,isis-ammo/ammo-gateway,isis-ammo/ammo-gateway,isis-ammo/ammo-gateway