Use ImportBeanDefinitionRegistrar for @ServiceScan

Needs some tidying, but this is a version that I think might work
better with Spring Boot.