Integrate Tim's styling
Merge branch 'master' of github.com:tmlayton/globalhack