gitignore cleanup
Merge branch 'master' into protocol-aggregation