Fixed some docblocks
Merging.
Add a cache of snake, camel, and studly cased words.
fix conflicts.