Include security into regular buildbot build; update config options