Fix bug

Removed extra comma on line 78
Condor doesn't need to do anything special for the hostname on GCE

Made the ec2 stype hostname determination conditional to not running on
the GCE. The default hostname seems to be sane.