Make sure all roles contain the profiles they use
Remove a few hard-coded values (pull them from module variables)