Big commit with many changes, better map reduce and Gherkin acceptance specs