Trying this again...
fixed
Merge branch 'nn-getHostname' of http://github.com/nwnoga/ec2_backup into nn-getHostname