update and merge ignore files

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>

.gitignore

@@ -7,6 +7,7 @@ doc/man/man*/*.1
 doc/man/man*/*.7
 doc/man/man*/*.html
 doc/man/man*/*.xml
+doc/man/man*/cdist-reference.text
 # Ignore type manpages
 doc/man/man*/*__*.text
 

doc/man/.gitignore

@@ -1,4 +0,0 @@
-cdist.7
-*.html
-cdist-design.7
-cdist-reference.text