Better way of loading 'rvm' variables
Merge branch 'master' of github.com:atmosx/argos

Conflicts:
	local.sh