Fix detection of VTK 6.
Work on support for VTK 6.
Merge branch 'johannr/fix-issue-149'