Nicer cucumber output from rake task
Minor code clean-up