removed main.h - fixes issue #194
fix compile error in integration tests - travis-ci should be happy now
more compile for unit tests after factoring out main.h, now it really does build this time.
Merged in latest feature/hal branch (running make in main/build fails)