Merge pull request #53 from noahd/master

Fix makefiles for various configurations