updating x264 peg to current master
Merge remote-tracking branch 'guardian/master'
fixing sox repo url
Merge pull request #8 from scalio/master

fix broken sox url