Use role dependencies instead of explicit include_roles

Use role dependencies instead of explicit include_roles #231