updates, adds linux commands
Merge branch 'master' of https://github.com/farfanoide/dotfiles

Conflicts:
	bin/farfan/alias
	vimrc