Various changes
Merge branch 'master' of https://github.com/Carmol/powercalc

Conflicts:
bin/manifest.pl
scripts/mycalcs.js