Update .gitignore.
Merge branch 'master' into 0.2