nojira
Merge pull request #27 from garethleonard/cleanup

nojira
Setup refactor
Merge pull request #28 from garethleonard/setup-refactor

Setup refactor + Cucumber update