Fixed makefiles to always find code and other makefiles correctly
Resolved merge conficts with upstream
Merge pull request #25 from nwoods/master

Nate's makefile changes