minor changes
Merge branch 'develop' of github.com:crywolfe/buggy-bus-app into develop
clean up to try to figure out duplication log bug