setting up to generate manifest.json from secret key file
Merge branch 'master' of github.com:PossibleWhale/Sheared
create the tapjoyads symlink during make
Merge branch 'master' of github.com:PossibleWhale/Sheared