Netflix/asgard — pull request #518 by aglover (2014-03-24 21:15:25+00:00)
Title: Put back in old code for m3s 

But left in the slight refactoring for easier testing. AWS & M3s are in flux at the moment.