Build fixes for Unix, removing libcurl from Unix makefile, and cleaning up Unix makefile

See commit messages for details.