Updated distance values for ally behaviour

Changed some distance constant values used by ally behaviour to use suitable floating point values.

The other changes in here are just changes which have already been pulled into the master branch.