Update PATH, add Android Studio
Update plugins
Add Vintageous
Merge branch 'master' into mezuro

Conflicts:
	.zshrc