Merge pull request #38 from ZooTypers/master

updating david's changes
Merge pull request #39 from ZooTypers/master

updating for codepro
ran codepro and fixed minor website/logging stuff
Merge pull request #215 from winglam/master

ran codepro and fixed minor website/logging stuff