new laptop
added global gitignore
Merge branch 'master' of https://github.com/kraf/fkdotfiles

Conflicts:
	.vim/.netrwhist