Some refactoring
Merge branch 'wip/h3nk3-enable-monitoring' of github.com:typesafehub/activator into wip/h3nk3-enable-monitoring