Convenience scripts for switching Vienna versions.
Revert "Convenience scripts for switching Vienna versions."

This reverts commit fe3b38b74d20ec4455e29470c0b6c4446b8e458f.
Version specific Makefile.
Makefile merge resolution.
Make 2.1.2 branch look like fftbor2d