update .gitignore
Merge branch 'master' of github.com:takaishi/.emacs.d