updated devtracker.rb to cope with recent merges
updated devtracker.rb to cope with recent merges

DFID/devtracker-from-api,DFID/devtracker-from-api,DFID/devtracker-from-api,DFID/devtracker-from-api,DFID/devtracker-from-api