Merge pull request #23 from indykish/master

minor fix to ec2
upgrade golang to 1.4.beta1