Makefile cleanup.
Merge pull request #16 from smashwilson/cleanup-makefile

Makefile cleanup.