update .gitignore
Merge branch 'master' of https://github.com/nesl/mercury

update .gitignore and try to merge
clear junk files which shouldn't be tracked