Moved Carlib to all Sets
Add inherited=false to const lookups when not 1.8
Check in to make sure I've merged everything
Not quite working
All test passing after merge