Moving proto config to gulpfile
Merge branch 'master' into custom