Merge branch '3.0.x'

Closes gh-963

Author: wilkinsona

.gitignore

@@ -6,5 +6,6 @@ bin
 build
 !buildSrc/src/main/groovy/org/springframework/restdocs/build/
 target
-.idea
+.idea/*
+!.idea/icon.svg
 *.iml