Monkeyiq/2014oct/travisosx1: Please ignore this PR, do not merge it!

I am testing the osx travisci stuff I should now be able to get an app.zip again, at the expense of the linux build not working with one of these changes. 

Obviously have to fix that before any real merge.