merge evolutions for simplicity and rapid iteration

was just playing with evolutions anyway; they're unnecessary pre-production