updated .gitignore
another gitignore update
Merge remote-tracking branch 'bathtub/master'