Merge pull request #337 from patriot1burke/master

app/keycloak self bootstrapping bundle
move things around