Flintstone house owner settles with California town, will be allowed to keep cartoon-inspired additions