Documentation Consistency
Removing un-needed code
Using escapeTrait more
Enforcing requirement of escapeTrait on other traits
Updating bootstrap to new core location