Improve class and function definition identification

[PhilipNelson5]

If a function uses the words class or def in it's signature, it breaks the definition identification. This expands the match to include the function/class name and arguments to disambiguate this case.

closes #190