Fixed template variable invocations
Merge branch 'test'

Added in rvm template fixes