Merge pull request #316 from zzamboni/master

Miscellaneous fixes for cf-sketch.
remove symlink
Merge pull request #318 from atsaloli/master

examples: remove symlink (symlinks break cfengine build process)
renamed todo to todo2 for Mac filesystems