Merge pull request #2305 from ey6es/master

Avatar performance improvements, toggle for Visage (and code to allow it to play nice with Faceshift).  Closes #2300.