Get master set up for buildout

I want to switch buildout.cfg for KAPx/kapx-courses to use master instead of develop so I have to get these changes into master