Remove controller.cpp from simulator for OSX compatibility.
Merge