Squashed commit of the following:

commit 4e7be59eb540c98f3ec0e58b251f8a1a9d9cd445
Author: stephane brossier <sbrossier@groupon.com>
Date:   Sat Sep 27 10:54:52 2014 -0700

    Fix usage apis (api change)

commit 3bf3767d10ce66e838745a0df2fd8ef7849fd7b5
Author: stephane brossier <sbrossier@groupon.com>
Date:   Sat Sep 27 10:54:27 2014 -0700

    Regenerate models for usage api change