fixed bug: watchdog timeout causes bad exception. mac build.
Merge branch 'master' of git://github.com/pcpratts/rootbeer1 into develop

Conflicts:
	csrc/rootbeer.dylib
	csrc/rootbeer_cuda.dylib