Merge branch 'master' of github.com:ahupp/python-magic into aromanovich-master