support retina and non-retina screenshots

Give screenshots on retina displays an @2x in their filenames right after the device name so that the screenshots won't conflict when making a batch run with retina and non-retina devices.
Merge pull request #3 from chucks/retina_filenames

support retina and non-retina screenshots