Use integer time to generate cache IDs, applies to #1102
Fix cuke steps
Merge pull request #1109 from woodwardjd/maintain_file_conversion_across_processing

fix busted tests on ruby 1.8.7 (1.9.3 also re-checked)
Update URLs to carrierwaveuploader/carrierwave
Merge branch 'master' into cache_id
Fix recently added move_to_cache specs that were using the old cache ID format
Merge pull request #1108 from carrierwaveuploader/cache_id

Use integer time to generate cache IDs, applies to #1102
resolve test failure on travis-ci precise64 with ruby 1.8.7, rmagick 2.13.2, imagemagick 6.6.9-7 2012-08-17 Q16