Merge pull request #141 from fritsch/master

ActiveAE: Make ActiveAE the default engine