The Make rule for getting NetLogo should not be first
Merge remote-tracking branch 'origin/master' into headless

Conflicts:
	Makefile