Updates to image uploading
Merge branch 'master' of https://github.com/FarmBot/OpenFarm into rickcarlino-master
Merge pull request #222 from simonv3/rickcarlino-master

More If statements in the template