Incremental concerns + re-factoring

Application of incremental execution plus some re-factorings around removing Json concerns from the sbt plugin.