Basic templating fixes #2
Merge branch 'master' of github.com:satnogs/satnogs-network