Added separation tests and fixed bugs.
Genericised function names and added predator repulsion.
Added weights for vectors.