Fixed issue with TASK_PICKME_CONFLICT not always being called with pushmanager_url
_test_pickme_conflict_master now also passes pushmanager_url
Fixed failing tests for _test_pickme_conflict_master
TEST_ALL_PICKMES and TEST_CONFLICTING_PICKMES enqueues both now pass pushmanager_url
Merge pull request #124 from Yelp/git_pickme_conflict_passes_pm_url

TASK_PICKME_CONFLICT not always being called with pushmanager_url

When a pickme is found to be conflicted, it notifies the offender with an email which references the pushmanager app.