Updates and Fixes

- add-executable updated to support generic include directories
  and facility to add libraries to link to
- fix in library-CMakeLists.txt.template naming