removed m2crypto import from unit tests, since we don't install it in our build script or use it
added unit test and code to allow users to specify php as the language runtime in their app engine app
using -F in tail command, so that appscale tail works across appscale cluster deploys
merged with org/testing
Updated to Apache 2.0 license
Merge pull request #321 from AppScale/license2

Updated to Apache 2.0 license
fixed broken unit test
Merge pull request #229 from shatterednirvana/allow-php-apps

Allow php apps to be given via upload-app or deploy
Merge remote-tracking branch 'org/testing' into use-tail-F
Merge pull request #316 from shatterednirvana/use-tail-F

using -F in tail command, so that appscale tail works across appscale deploys
Merge branch 'testing' of github.com:AppScale/appscale-tools into scale-safe