Merge pull request #656 from jonezy/master

couple more production hotfixes.
calculator style updates
Merge branch 'master' of https://github.com/RichmondDay/www.mini.ca
Merge pull request #658 from shutter111/master

calculator style updates