Fix logging configuration and macros
Merge branch 'develop' of github.com:magicalpanda/MagicalRecord into develop