android path and fix for rvm
Merge remote-tracking branch 'origin/master'