Updated Rakefile

Last couple of modifications to fix variable parsing in strings