Sync with cloud9 + better demos

@lennartcl