little Makefile updates, .h/.hpp changes
Merge branch 'master' of https://github.com/RAM518/Open-Transactions