Transitioned to incremental output and added bolding for fully-watched folders
Merge branch 'master' into dev