[nginx/epel7] (5 commits) ...Merge branch 'master' into epel7

[Jamie Nguyen]

Summary of changes:

  84b0cb9... Create nginx-filesystem subpackage (patch from Remi Collet) (*)
  24a9355... Create /etc/nginx/default.d directory (*)
  790674d... Add vim files (#1142849) (*)
  09d7176... Revert "Create nginx-filesystem subpackage (patch from Remi
  bb4239e... Merge branch 'master' into epel7

(*) This commit already existed in another branch; no separate mail sent