Bring a few details in line with Rails 4.1
Mark CLI feature tests as WIP

The tests need to be improved to eliminate intermittent failures