Makefile

Minor changes to the Makefile: an encoding fix and an error message for when MODEL or LAYOUT are not set.

This is the last of the trivial pull requests.