Added click handlers to other directives.  Reworked markerlabel directive to use a single template instead of switching between two different ones (Necessary to be able to dynamically switch between them using the type attribute