refactored logging
Merge branch 'dev' of github.com:curtisullerich/butterflies into dev