added keywords for Mocha unit tests (when using karma test runner)
fixed services keywords, the regexp-opt was messing them up
services keywords now use the builtin face instead of the constant face
controller and directive definition keywords now use the type face
instead of the keyword face