Merge pull request #1 from tmagik/master

Proposed fork with 1 block adjust
Compile on 'modern' OS X
Merge https://github.com/ambethia/catcointestnet