Fix for #207, Some escaped '$' characters are not unescaped#222

Merged

bkeepers merged 4 commits intobkeepers:masterfrom gautam-ndk:fix_proper_escaping_of_dollar_v2

Dec 2, 2015