adding connect-flash
merge service to pubsub service
moving annotators to services