Some merge problem in packrat. Remove folder for now. Check back once development settles down.