Better git ignore
Minor checkstyle fixes