fixed ordering of whitelisted items in gitignore
Merge branch 'master' into AG-dallas