Reorganized the features. Also updated the gherkin utilities compare line arrays to use regular expressions.  This meant I had to udpate all the features to escape special characters.  I also updated them so that they do not break when the id values change.