2.1.15

Refactored Cache system some to help with performance analysis
Performance improvements in cache system and Avoidance system
Merge branch 'master' of git://git.assembla.com/unifiedtrinity