upgrades the production server a bit
merges production master & dev
adds in some error handling messaging