Decoupled several things from bootstrap roles into subroles and added several default and group variables