Added RVM back in :/
Added androidSDK cli tools to PATH
Removed rbenv (moving back to rvm)
Move RVM loading to the end of the file (otherwise RVM complains)
Fixed RVM init stuff
Updated line-endings