get rid of .keepdir and use the .gitignore file for forcing a dir