new bpwatch

instrumentation

Merge remote-tracking branch 'origin/master'

python-2.7.4 default version

Merge pull request heroku#73 from incuna/hooks-fix

Use $BIN_DIR in hooks.

new pylibmc test

unnecessary PYTHONHOME for uWSGI

much better