quick overall style cleanup
Merge branch 'master' of github.com:rgbchris/g-panel
merge conflict correction