Taylor Swift and Katy Perry appear to have squashed the beef between them, with Perry making a fun cameo in Swift's video for ...