Combined feature step definitions with development branch step_definitions.rb and generalized some steps to be in line with story acceptance criteria