Updated .gitignore and cleaned up javadoc