Jhbate/integration

@nicolashery @ianjorgensen still have a couple more pieces to integrate (i.e. remove myself from care team which appears not to be wired up in the ui yet) but should be ship-shape for merging with the current a-and-i branch.

Cheers
Jamie