alias ls and tar
change PATH and MANPATH
man path
powerline
Merge commit '3726149'

Conflicts:
	emacs
	zshrc