bump tap, david, gitignore
merge