Fix vsync problem

And additionally bring some stuff up to date
Merge pull request #1 from alcatel-cocktail/cm-10.1

Fix vsync problem