Switch to using gomock fork.
Merge pull request #988 from mozilla-services/gomock-fork

Switch to using gomock fork.
Merge branch 'dev' into geoip-bugfix
Test fix.