Fixed .gitignore following renaming of directories and javadoc setup in master