fixed issues in refactor
Merge branch 'master' of https://github.com/rainforestapp/GitSatisfaction
Merge branch 'master' of https://github.com/rainforestapp/GitSatisfaction

Merging in my bug fixes