Merge pull request #2033 from MPOS/development

UPDATE : Development to Master - NO VERSION
Update default.tpl

This was really out dated, i re-wrote for the pool i run and thought i would just paste it here as well.
Merge pull request #2055 from SamuelNZ/patch-6

Update default.tpl
Merge pull request #2056 from MPOS/master

Master to Development