Updated package references, etc
Updated .gitignore