Merge branch 'master' of blockhawk.net:../gitrepos/CoinVault