cleaned up logging in prep for task
Merge branch 'dev' of https://github.com/sugarcrm/candybean into dev