formatting fixes
Merge branch 'master' of github.com:zeusdeux/pimp