Merge pull request #56 from evoskuil/develop

Fix hdr makefile location, fix obelisk_client refs in VC++, refactor.
Merge pull request #59 from evoskuil/develop

Clean up some build details, add tests.