* Hopefully a clean branch for merging * Remove scan_interval, use defaults for now * Fix code style error