Souce extra stuff from ~/.extra.zsh

Close #24

Also clean up everything.
Remove useless stuff from zshrc
Clean up the zshrc file