Fixes more test paths
Removes cached file that snuck in
Merge branch 'python-package' into django-1.6
Adds IRC support
Merge branch 'features/irc' into deploy