Update font size and background
Merge branch 'master' of https://github.com/johndgiese/config
Remove bad merge crap