Decentralized Swarm Aggregation and Dispersion with Inter-Member Collision Avoidance for Non-holonomic Multi-Robot Systems.