Deploy to s3 & ec2 for master banch

Merging master into #14 was causing problems, this should work just fine.