Add rvm, and aws contexts