Artifacts from previous merge. PEP8 Complaince.
	modified:   core/models/machine.py