added LC_ALL export in profile and updated timeout to work
Merge branch 'python-location' of https://github.com/nlake44/appscale into locale
removing python2.5 support
fixed conflict
Merge pull request #750 from nlake44/remove-python25

Remove python25
Merge remote-tracking branch: upstream/master