Changing ^M chars to semicolons
Merge branch 'badchars' into rvm