removed keys
remove jj and ff only
Merge branch 'master' of https://github.com/hanloong/dotfiles

Conflicts:
	gitconfig