Fixes for gcc
Fixed makefile for Linux build
changes from trunk
Made compatible with Windows once again.
Ryan's OS X updates
test