added lockfiles (i.e. files ending in ~) to .gitignore and fixed an issue with the cucumber tests