Fix aliases in /etc/hosts for machines using a DNS suffix other than '.local'
Merge pull request #107 from continuuity/feature/short-hostnames

Fix aliases in /etc/hosts for machines using a DNS suffix other than '.local'