Merging in changes from fixns branch
Merge branch 'filemerge' of github.com:tsleyson/clean_html into filemerge