Castor and Pull-ux

Lots of changes to match Frontiers paper and to support the work I've been doing on NeuronUnit