Archimedes isn't wasteful
upgradable badge colour
Merge remote-tracking branch 'origin/master' into ed-isnotawebdesigner
typo fix, efficiency change
tool refresh #557