Merge pull request #796 from lassewesth/master

Using junit instead of ruby for acceptance tests