Merge branches 'domenic' and 'master'
Changes to adding user cucumber definition