Added mav's armoryd.py to project, and fixed 2832 bugs