Bug fixes and optimizations.
Merge branch 'master' of https://github.com/travisdesell/wildlife_at_home