updated gitignore
Merge branch 'master' of github.com:failshell/dotfiles

Conflicts:
	.gitignore
meh