Merge pull request #215 from winglam/master

ran codepro and fixed minor website/logging stuff
Merge pull request #40 from ZooTypers/master

updating for apk