Added option to specify generations as trigger to switch phi to task fitness. Not to be used with value trigger --evolvePhi. Also cleaned up some unnecessary code for --evolvePhi.

	modified:   main.cpp
Added ability to specify R thresholds and generation targets as well.
Fixed evolution, and fitness landscape transform for phi and r values.

 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   main.cpp
	modified:   tAgent.cpp
	modified:   tGame.cpp