Refactor complexity calculation to include variables and simplify
Merge pull request #41 from projecttacoma/complexity_of_variables

Refactor complexity calculation to include variables and simplify