updating templates
updating templates
added rvm path and timeformat
added alias
merge conflict resolved