minor cleanup
Add new AP features from Elie
Merge branch 'master' of github.com:idiap/bob