Update gitignore, and rollback require_tree