more changes
Merge branch 'style' of github.com:stevemcquaid/cmunity into style