log to stdout
Run line profile on demand
Merge branch 'master' into line-profiler