* Updated gitignore.
Merge branch 'master' into test-bullet-integration