Revert "Fix some more makefile stuff"

This reverts commit cc31d07b9836637a2854060d3a881fa006a8cc1b.
Delete version.h on make clean
Merge pull request #828 from fergus-dall/make-fix

Fix problems intoduced in cc31d07