fixed bugs and problems in imps and campaign bidder
Merge remote-tracking branch 'origin/master'
lots of changes, we need to fix the cost model! Also, the num imps is
wrong, but seems to be working...