Revert "Replace socket.getfqdn with socket.gethostname, to greatly improve lookup times, when the IP of the machine is not in the hosts file, or DNS running locally"

This reverts commit e90f92323bd303123381c5150e2474fe16667ee8.
work towards python 2.4 test support
Fix a merge conflict
python 2.4 wip
Merge of master
Fix the issue with AttributeError: '_patch' object has no attribute 'assert_called_once_with'
WIP for python 2.4 make test support
Fix python 2.4 testing for disk space
Merge branch 'master' of github.com:BrightcoveOS/Diamond into py24-test
Revert broken tests
Install bernhard for travis ci
Merge branch 'master' of github.com:kormoc/Diamond into py24-test
More python 2.4 test changes.
Fix onewire tests
Fix elastic search
Fix up testceph to support python 2.4
Fix up python 2.4 support for unit tests
pep8
Fix processmemory for python 2.5 and 2.6