Add cucumber to default rake tasks
Refactor for less ghetto