Android stuff.
Merge branch 'master' of github.com:duckinator/zshconf
Merge branch 'master' of github.com:duckinator/zshconf