changed some to pep8 conventions
Merge branch 'master' of github.com:arnellebalane/upcdorm