ton of changes, including logging
random files
Merge branch 'master' into dev_kernel

Merging Ross changes with Joel changes