Update README
Shorten
Update zshrc aliases
Fix conkyrc
Merge branch 'master' into supertab