Added ruby PATH and Android SDK
Fixed conflict in .zshrc