Fixes #57: move --vanilla to Makefile