Lots of bug fixes.  Also added a new step def "given i call the .* resource