remove mmintrin include that isn't needed anymore
remove some extra spaces
remove Faceplus as a face tracker option
Merge pull request #3600 from birarda/master

some dead code removal