cleaned up merge conflict junk
fixed log issues
fixed merge issue
Merge branch 'master' into blin