#7: fixed ec2 hostname and hosts setup for Ubuntu
Merge branch 'master' of github.com:accumulo/accumulo-saltstack