.gitignore
handle recursion for lists
Merge remote-tracking branch 'upstream/master'