Initial support for one-jar; .gitignore changes