Delete a bunch of data for the lolz.
Merge pull request #1057 from NatTuck/kill-amazon-phase-2

Delete a bunch of data for the lolz.
Merge remote-tracking branch 'upstream/master' into jp592