Update to match git head

* Use CMAKE instead of Waf
* Up the requirement to Vala 0.20.1