Made maec.Entity a subclass of cybox.Entity
Merge branch 'master' of github.com:MAECProject/python-maec