Pet cleaning

A series of commits to clean Pet (not all but many).

I couldn't compile the unit tests (due to some clash with my version of boost, should be fixed soon). How I could check that the avatar behaves like it should.

Please someone compile the tests to check it's alright.