Merge pull request #7 from Lederstrumpf/ImproveLinuxAndMacCompatibility

made non-default boincdatadir path OS agnostic
Merge pull request #8 from Lederstrumpf/ImproveLinuxAndMacCompatibility

Added target definition for C files to OSX makefile
CPUMiner20
Merge branch 'master' of https://github.com/gridcoin/Gridcoin-master

Conflicts:
	src/main.cpp
	src/makefile.osx
Fixed indentation in makefile.osx

Was careless during patching and editor converted indentation to spaces.
Added default boincdatadir paths for Linux, Mac OS X, and Windows XP