Revert "Make the simulator more explicit"

This reverts commit fcd3f86f170e64e91d9d3e5b9dc04e3b78ce9e63.
Revert "Make simulator default to iPhone 5s on iOS 8.0"

This reverts commit 777ea5f87db80ceafdef8a1f5a9648ddf1f6dced.