CFY-959 use master instead of develop, validate vagrant/docker versions, code cleanup