Update to follow desires/goals/actions logic
Merge branch 'master' of https://github.com/stefanbeeman/antfarm

Conflicts:
	world.go