Deprecated preg_replace() /e modifier in PHP5.5+

Replacing instances of preg_replace() that use the /e modifier to
preg_replace_callback() in order to future-proof Cindy.
Merge branch 'deprecated-php-features'