Cucumber/Feature mode, minor changes to deal with aquamacs