update .gitignore
update
Merge branch 'master' of github.com:fisto/dotfiles