add RVM path and disable laptop settings
merge branches