converted all the uints to uint64_ts. compiles but has not been fully tested yet
fixed the timing values in the ini files so that they are all now in nanoseconds instead of cycles. more testing is need to be sure that all the math works properly
fixed a problem with the channel beats calculation in the controller
forgot to save one of the files before the last commit
added a typdef for uint just to be on the safe side though I think there aren't any uints left. also checked the timing values with the new code and they appear to work well, within like 2 or 10 cycles of the old code
added the makefile changes suggested by Jagan's NVDIMMSim repo
Added the MACOS target.
Merge pull request #1 from jaganj/sandia

Added the MACOS target in the Makefile.
Fix compiler warnings from GCC and Clang.
Merge remote-tracking branch 'jim/stable' into sandia

Conflicts:
	src/Controller.cpp
	src/Die.cpp
	src/FrontBuffer.cpp
	src/Ftl.cpp
fixed init.cpp type mismatches that were causing a weird ini error in hybridsim
Remove debug statements from prior commit.
removed some minor debug couts that I had forgotten about
Merge branch 'sandia' of https://github.com/watchmaker/NVDIMMSim into sandia
merged with sandia branch to pull in uint64 changes, also made a few minor changes