forgot to include the defines method for upstream merge
forgot to include the defines method for upstream merge

cturra/fpm,josephfrazier/fpm,doghrim/fpm,fetep/fpm,hlawrenz/fpm,dischord01/fpm,Tapjoy/fpm,wyaeld/fpm,sideci-sample/sideci-sample-fpm,virtkick/fpm,godp1301/fpm,schatt/fpm,joseph-onsip/fpm,schatt/fpm,pskrz/fpm,rbramwell/fpm,sideci-sample/sideci-sample-fpm,fetep/fpm,snailwalker/fpm,djhaskin987/merge-demo,hlawrenz/fpm,cturra/fpm,elvido/fpm,josephfrazier/fpm,mzaccari/fpm,schatt/fpm,joseph-onsip/fpm,dischord01/fpm,jerizm/fpm,virtkick/fpm,pskrz/fpm,elvido/fpm,snailwalker/fpm,rbramwell/fpm,jerizm/fpm,jedisct1/fpm,tjyang/fpm,joseph-onsip/fpm,wyaeld/fpm,Tapjoy/fpm,mildred/fpm,vi4m/fpm,dischord01/fpm,elvido/fpm,godp1301/fpm,snailwalker/fpm,cturra/fpm,johnbintz/fpm,pskrz/fpm,fetep/fpm,Tapjoy/fpm,paul-krohn/fpm,mildred/fpm,vi4m/fpm,joseph-onsip/fpm,doghrim/fpm,vi4m/fpm,wyaeld/fpm,dischord01/fpm,jerizm/fpm,pskrz/fpm,mildred/fpm,godp1301/fpm,paul-krohn/fpm,tjyang/fpm,rbramwell/fpm,cturra/fpm,jedisct1/fpm,linearregression/fpm,sideci-sample/sideci-sample-fpm,linearregression/fpm,gearmover/fpm,Tapjoy/fpm,godp1301/fpm,snailwalker/fpm,josephfrazier/fpm,tjyang/fpm,johnbintz/fpm,vi4m/fpm,mildred/fpm,tjyang/fpm,hlawrenz/fpm,virtkick/fpm,mzaccari/fpm,jerizm/fpm,wyaeld/fpm,jedisct1/fpm,josephfrazier/fpm,djhaskin987/merge-demo,johnbintz/fpm,rbramwell/fpm,mzaccari/fpm,doghrim/fpm,linearregression/fpm,paul-krohn/fpm,linearregression/fpm,mzaccari/fpm,gearmover/fpm,virtkick/fpm,elvido/fpm,hlawrenz/fpm,gearmover/fpm,schatt/fpm,paul-krohn/fpm,fetep/fpm,doghrim/fpm,gearmover/fpm,djhaskin987/merge-demo