add .gitignore
Merge branch 'for-py2.6'