Fixed list comprehension bug with history_machine_list.
	modified:   api/machine.py
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere