Add S3 Support, changing the API a bit.

He is melting my inbox: :expressionless: 

![inbox](http://f.cl.ly/items/2B2Y262Q0c2c0Z1o2l1O/Image%202014-09-11%20at%203.04.02%20PM.png)