Re-implemented ps2 controllers
Fixed bug with controller selection from command line