Add a fix to diffmerge to allow diffmerge to be invoked from the
command line. Fixes #5133
Added new cask for Pangu

- iOS 7.1.x jailbreaking tool
Merge pull request #5150 from vitorgalvao/fix-5149

Added new cask for Pangu
Merge pull request #5146 from drew-gross/update-diffmerge

Update diffmerge
update Shiori to 1.0.2
Merge pull request #5152 from kols/shiori

update Shiori to 1.0.2