Cleaned up some of the lint issues
Merge branch 'master' of https://github.com/tjchaplin/zero-point-nine