More work on Rain Water Buckets. Moved helper functions into CobraFeats from the listener.
Merge origin/master