Added control of removing XML tags
Revert "Added control of removing XML tags"

This reverts commit 91ce62588c707d034e420cfb93a3e272e191df58.
Added control of removing XML tags
Merge branch 'zack'
Merge branch 'master' into skyler