Ensure that gitignore folders only apply at top level of folder structure
Merge pull request #1 from ChrisMuriel/jc-fix-ignore

Ensure that gitignore folders only apply at top level of folder structure
Merge remote-tracking branch 'origin/master' into jc-proto-light