Updated to work with xcode 6 and multiple device simulators