remove .gitignore in preparation for merge
subtree merged in core-hq (s2 branch)
Merge branch 'master' into core-hq-s2