Merge pull request #174 from frostalf/master

Made Exceptions catch specific exceptions instead of any exceptions
Merge pull request #176 from frostalf/master

Cleanup PR. Does not actually change how things work.
Fix PetAdmin name command not working
Completely redesign pets (again)

Fixes a lot of issues as well
Fix merge issues
Format
such merge issues
Remove this - doesn't work as needed anymore. #168
Register entities in more places