Merged Utter's latest dev branch
Working on bad wording in step defs/features
Latest merges from Utter's development branch.