More fixes to the benchmarks
Merge branch 'warp_to_mask' of github.com:jabooth/menpo into warp_to_mask