Update miner.h

fixes compiler errors on OS X 10.9
Merge pull request #6 from Mariu5/patch-1

Update miner.h
Revert "Update miner.h"
Merge pull request #7 from cryptozoidberg/revert-6-patch-1

Revert "Update miner.h"
Merge remote-tracking branch 'upstream/master'