Use DB representation for machine information, rather than relying on .esh .. UPDATE RTWO (yes again!)
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere