Bit of code reorg -- mostly making private consts of things which don't change at runtime
closes #9
Merged SwimmerBehavior code