merge master to john

didn't merge john prior to this
Merge branch 'master' into John
new background

some other small format changes
Merge branch 'John'
New background/formatting stuff

New background/formatting stuff