Clean up dirty string replace functions into regex
Merge branch 'master' of ssh://gloo.fraboom.com/home/gloo/stage