Merge pull request #1 from mozmark/master

added transparent proxy shell script
Merge remote-tracking branch 'upstream/master'