get rid of wacky tcwrap and privacywrap styles
Merge branch 'master' into gh-pages