paring down style
style
Merge branch 'master' into wed_style
resolved conflicts