Style cleanup; removed some erroneous class-scoped variables.
Merge branch 'master' of github.com:oneironautics/cloudfiles-backup