Rename roles to match repos
Update submodules. Remove nginx since it's been folded into drupal.