Merge pull request #59 from smoser/localdev

several changes, largest of which is logging output