change gitignore

do not view .vim-backup
Merge branch 'master' of https://github.com/ryokosuge/dotfiles

Conflicts:
	.gitignore