added .gitignore
removed .hgignore
Merge remote-tracking branch 'upstream/master'