Get rid of subdirectories.
Merge branch 'master' into twitter
Move zsh.