Fudge for rsync normalize issue where hostname is converted to IP address
Cotton fix for rsync
vm_task merge
fixes to use env.gateway and moved get_pillar
pep8
durations
Re-introduce exception to help migration
Merge pull request #5 from ministryofjustice/skyscape-rsync-and-highstate

Skyscape rsync and highstate