Issue #474:
- Fix macro names
- Fix VTK 6 support
Merge branch 'develop' of https://github.com/feelpp/feelpp into develop