Fix PATH for Android Studio
Merge branch 'master' of github.com:jaxbot/vimfiles
Clean up zshrc