updated ignore, merged in more settings