Added a type property for each directive.  Added track click handler.  Made some calls more consistent with other parts of the code
Merge branch 'master' of https://www.github.com/vixis/angularplasmid