Added zsh plugins; removed aliases; Some cleanup