change local android-sdk path to brew one
enable osx and python modules
remove rvm function call from zprofile
add python virtualenv name to prompt
Merge branch 'theme/aelesbao' into custom

* theme/aelesbao:
  add python virtualenv name to prompt

Conflicts:
	modules/prompt/functions/prompt_aelesbao_setup