code formatting
Merge branch 'master' of github.com:dpettigrew/DPTheme into HEAD