Ignoring vim files
Additional javadoc and final local variables to satisfy checkstyle