added explicit aic switch
Merge branch 'labeling' of github.com:bmcfee/olda into labeling