Making things use getCurrentBlockTemplate() rather than cached_block_template
Merge branch 'master' of github.com:fireduck64/SockThing