edit .gitignore
Merge branch 'master' of github.com:remain/dotfiles
fix behavior of when to put symbolic link