Blah :)
Merge branch 'master' of https://github.com/abocati/magento-amazons3-customfile